Revert "libata: Align ata_device's id on a cacheline"

This reverts commit cea2cbff57c5b65375adb6fe65612c10a7301327, which
was commit 4ee34ea3a12396f35b26d90a094c75db95080baa upstream.  It's a
real fix but we've lived with the problem for many years and it
doesn't seem worth breaking ABI to fix it right now.

Gbp-Pq: Topic debian
Gbp-Pq: Name revert-libata-align-ata_device-s-id-on-a-cacheline.patch

diff --git a/include/linux/libata.h b/include/linux/libata.h
index b20a2752f934f8f427d796341ed0a433f1948487..600c1e0626a5ff6c91df3a0b2f2fcf0ef485fedf 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -718,7 +718,7 @@ struct ata_device {
        union {
                u16             id[ATA_ID_WORDS]; /* IDENTIFY xxx DEVICE data */
                u32             gscr[SATA_PMP_GSCR_DWORDS]; /* PMP GSCR block */
-       } ____cacheline_aligned;
+       };
 
        /* DEVSLP Timing Variables from Identify Device Data Log */
        u8                      devslp_timing[ATA_LOG_DEVSLP_SIZE];